Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Few fixes for multiple themes support feature #47686

Merged
merged 1 commit into from
Jan 25, 2018

Conversation

GuillaumeGomez
Copy link
Member

@GuillaumeGomez GuillaumeGomez commented Jan 23, 2018

@@ -197,7 +197,7 @@ a.test-arrow {

#help dt {
border-color: #bfbfbf;
background: #fff;
background: rgba(0,0,0,0);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This creates black-on-black text for the keyboard shortcut keys on the help window.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ohh, i didn't realize that the help window keys got switched over to <kbd> tags. This is fine.

padding: 4px;
text-align: center;
background: rgba(0,0,0,0);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pretty sure there's a conversation somewhere about where the colors need to go, since you recently made sure every color directive went into the theme css. Or did you want the theme-picker button to look the same in every theme? >_>

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I want to the background of the button to be invisible so that the buttons background is consistent to its parent. It's the only case where I'll put colors in this file.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ohhhh, no alpha, now i get it.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hehe.

@@ -364,16 +364,20 @@ kbd {
background: #f0f0f0;
}

#theme-picker:hover {

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you add the same style for :focus? Currently, you can't tell if the button is focused or not.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sure.

}

#theme-choices > div:hover {
#theme-choices > button:hover {

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same thing regarding :focus as above.

}

#theme-choices > div:hover {
#theme-choices > button:hover {

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:focus?

border: 1px solid;
border-radius: 3px;
cursor: pointer;
}

#theme-picker:hover {

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:focus?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should be in main.css actually. Strange...

@kennytm kennytm added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 24, 2018
@@ -74,10 +74,12 @@ r##"<!DOCTYPE html>
{sidebar}
</nav>

<button id="theme-picker">
<img src="{root_path}brush.svg" width="18" alt="Pick another theme!">
<div class="theme-picker">
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

do we know why this change makes it work? semantically, this should be a <button>.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Now it's a <button> inside this <div> so i would assume that there's some layout trickery going on.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just like @QuietMisdreavus said. :) Before it was buttons inside a button, now it's buttons inside a div. More logical for everyone (browsers included).

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh right, i was missing the other <button>s being put inside this one. I like this version more.

@QuietMisdreavus
Copy link
Member

Looks good to me! Thanks for the quick follow-up!

@bors r+

@bors
Copy link
Contributor

bors commented Jan 24, 2018

📌 Commit e78f139 has been approved by QuietMisdreavus

@QuietMisdreavus
Copy link
Member

@bors p=1

The theme selector is broken in Firefox right now, and this fixes that, so let's give it a little push.

@bors
Copy link
Contributor

bors commented Jan 24, 2018

⌛ Testing commit e78f139 with merge e86fd3fb77f10efbb172f185629bc1b83779e6e5...

@bors
Copy link
Contributor

bors commented Jan 25, 2018

💔 Test failed - status-appveyor

@Mark-Simulacrum
Copy link
Member

@bors retry - appveyor timed out

@bors
Copy link
Contributor

bors commented Jan 25, 2018

⌛ Testing commit e78f139 with merge 4cf26f8...

bors added a commit that referenced this pull request Jan 25, 2018
Few fixes for multiple themes support feature

r? @QuietMisdreavus

Fixes #47695.
@bors
Copy link
Contributor

bors commented Jan 25, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: QuietMisdreavus
Pushing 4cf26f8 to master...

@bors bors merged commit e78f139 into rust-lang:master Jan 25, 2018
@GuillaumeGomez GuillaumeGomez deleted the theme-fixes branch January 25, 2018 10:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants